Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:29:30 +0000 (18:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:29:30 +0000 (18:29 -0800)
commit104b064875bef9f8078cc453ce35b205e4e00d06
tree1c9983707f917e1fa3b2139c59f0b50a84d9d0ef
parent5c7a30e916e1a00300bc9a8af6e6b457f28a9597
parentb8b94c3f9078a55e9dccbca54855bc6289d1f8e4
Merge from trunk.
src/ChangeLog
src/alloc.c
src/fileio.c
src/lisp.h
src/xdisp.c